var Client = class {
constructor() {
- this._proxy = null;
+ this._proxy = null;
let nodeInfo = Gio.DBusNodeInfo.new_for_xml(BoltClientInterface);
Gio.DBusProxy.new(Gio.DBus.system,
Gio.DBusProxyFlags.DO_NOT_AUTO_START,
null,
this._onProxyReady.bind(this));
- this.probing = false;
+ this.probing = false;
}
_onProxyReady(o, res) {
try {
- this._proxy = Gio.DBusProxy.new_finish(res);
+ this._proxy = Gio.DBusProxy.new_finish(res);
} catch (e) {
- log('error creating bolt proxy: %s'.format(e.message));
+ log('error creating bolt proxy: %s'.format(e.message));
return;
}
- this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this));
- this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this));
+ this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this));
+ this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this));
- this.probing = this._proxy.Probing;
- if (this.probing)
- this.emit('probing-changed', this.probing);
+ this.probing = this._proxy.Probing;
+ if (this.probing)
+ this.emit('probing-changed', this.probing);
}
_onPropertiesChanged(proxy, properties) {
let unpacked = properties.deep_unpack();
if (!('Probing' in unpacked))
- return;
+ return;
- this.probing = this._proxy.Probing;
- this.emit('probing-changed', this.probing);
+ this.probing = this._proxy.Probing;
+ this.emit('probing-changed', this.probing);
}
_onDeviceAdded(proxy, emitter, params) {
- let [path] = params;
- let device = new BoltDeviceProxy(Gio.DBus.system,
- BOLT_DBUS_NAME,
- path);
- this.emit('device-added', device);
+ let [path] = params;
+ let device = new BoltDeviceProxy(Gio.DBus.system,
+ BOLT_DBUS_NAME,
+ path);
+ this.emit('device-added', device);
}
/* public methods */
if (!this._proxy)
return;
- this._proxy.disconnectSignal(this._deviceAddedId);
- this._proxy.disconnect(this._propsChangedId);
- this._proxy = null;
+ this._proxy.disconnectSignal(this._deviceAddedId);
+ this._proxy.disconnect(this._propsChangedId);
+ this._proxy = null;
}
enrollDevice(id, policy, callback) {
- this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE,
+ this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE,
(res, error) => {
- if (error) {
- Gio.DBusError.strip_remote_error(error);
- callback(null, error);
- return;
- }
-
- let [path] = res;
- let device = new BoltDeviceProxy(Gio.DBus.system,
- BOLT_DBUS_NAME,
- path);
- callback(device, null);
- });
+ if (error) {
+ Gio.DBusError.strip_remote_error(error);
+ callback(null, error);
+ return;
+ }
+
+ let [path] = res;
+ let device = new BoltDeviceProxy(Gio.DBus.system,
+ BOLT_DBUS_NAME,
+ path);
+ callback(device, null);
+ });
}
get authMode () {
/* helper class to automatically authorize new devices */
var AuthRobot = class {
constructor(client) {
- this._client = client;
+ this._client = client;
- this._devicesToEnroll = [];
- this._enrolling = false;
+ this._devicesToEnroll = [];
+ this._enrolling = false;
- this._client.connect('device-added', this._onDeviceAdded.bind(this));
+ this._client.connect('device-added', this._onDeviceAdded.bind(this));
}
close() {
- this.disconnectAll();
- this._client = null;
+ this.disconnectAll();
+ this._client = null;
}
/* the "device-added" signal will be emitted by boltd for every
* only interested in those devices, because all known devices
* will be handled by the user himself */
_onDeviceAdded(cli, dev) {
- if (dev.Status !== Status.CONNECTED)
- return;
+ if (dev.Status !== Status.CONNECTED)
+ return;
/* check if authorization is enabled in the daemon. if not
* we won't even bother authorizing, because we will only
if (!cli.authMode.split('|').includes(AuthMode.ENABLED))
return;
- /* check if we should enroll the device */
- let res = [false];
- this.emit('enroll-device', dev, res);
- if (res[0] !== true)
- return;
-
- /* ok, we should authorize the device, add it to the back
- * of the list */
- this._devicesToEnroll.push(dev);
- this._enrollDevices();
+ /* check if we should enroll the device */
+ let res = [false];
+ this.emit('enroll-device', dev, res);
+ if (res[0] !== true)
+ return;
+
+ /* ok, we should authorize the device, add it to the back
+ * of the list */
+ this._devicesToEnroll.push(dev);
+ this._enrollDevices();
}
/* The enrollment queue:
* enrolled.
*/
_enrollDevices() {
- if (this._enrolling)
- return;
+ if (this._enrolling)
+ return;
- this._enrolling = true;
- GLib.idle_add(GLib.PRIORITY_DEFAULT,
- this._enrollDevicesIdle.bind(this));
+ this._enrolling = true;
+ GLib.idle_add(GLib.PRIORITY_DEFAULT,
+ this._enrollDevicesIdle.bind(this));
}
_onEnrollDone(device, error) {
- if (error)
- this.emit('enroll-failed', device, error);
-
- /* TODO: scan the list of devices to be authorized for children
- * of this device and remove them (and their children and
- * their children and ....) from the device queue
- */
- this._enrolling = this._devicesToEnroll.length > 0;
-
- if (this._enrolling)
- GLib.idle_add(GLib.PRIORITY_DEFAULT,
- this._enrollDevicesIdle.bind(this));
+ if (error)
+ this.emit('enroll-failed', device, error);
+
+ /* TODO: scan the list of devices to be authorized for children
+ * of this device and remove them (and their children and
+ * their children and ....) from the device queue
+ */
+ this._enrolling = this._devicesToEnroll.length > 0;
+
+ if (this._enrolling)
+ GLib.idle_add(GLib.PRIORITY_DEFAULT,
+ this._enrollDevicesIdle.bind(this));
}
_enrollDevicesIdle() {
- let devices = this._devicesToEnroll;
+ let devices = this._devicesToEnroll;
- let dev = devices.shift();
- if (dev === undefined)
- return GLib.SOURCE_REMOVE;
+ let dev = devices.shift();
+ if (dev === undefined)
+ return GLib.SOURCE_REMOVE;
- this._client.enrollDevice(dev.Uid,
- Policy.DEFAULT,
- this._onEnrollDone.bind(this));
- return GLib.SOURCE_REMOVE;
+ this._client.enrollDevice(dev.Uid,
+ Policy.DEFAULT,
+ this._onEnrollDone.bind(this));
+ return GLib.SOURCE_REMOVE;
}
};
Signals.addSignalMethods(AuthRobot.prototype);
constructor() {
super();
- this._indicator = this._addIndicator();
+ this._indicator = this._addIndicator();
this._indicator.icon_name = 'thunderbolt-symbolic';
- this._client = new Client();
- this._client.connect('probing-changed', this._onProbing.bind(this));
+ this._client = new Client();
+ this._client.connect('probing-changed', this._onProbing.bind(this));
- this._robot = new AuthRobot(this._client);
+ this._robot = new AuthRobot(this._client);
- this._robot.connect('enroll-device', this._onEnrollDevice.bind(this));
- this._robot.connect('enroll-failed', this._onEnrollFailed.bind(this));
+ this._robot.connect('enroll-device', this._onEnrollDevice.bind(this));
+ this._robot.connect('enroll-failed', this._onEnrollFailed.bind(this));
- Main.sessionMode.connect('updated', this._sync.bind(this));
+ Main.sessionMode.connect('updated', this._sync.bind(this));
this._sync();
- this._source = null;
+ this._source = null;
this._perm = null;
Polkit.Permission.new('org.freedesktop.bolt.enroll', null, null, (source, res) => {
_onDestroy() {
this._robot.close();
- this._client.close();
+ this._client.close();
}
_ensureSource() {
let source = this._ensureSource();
- this._notification = new MessageTray.Notification(source, title, body);
- this._notification.setUrgency(MessageTray.Urgency.HIGH);
+ this._notification = new MessageTray.Notification(source, title, body);
+ this._notification.setUrgency(MessageTray.Urgency.HIGH);
this._notification.connect('destroy', () => {
this._notification = null;
});
/* Session callbacks */
_sync() {
let active = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
- this._indicator.visible = active && this._client.probing;
+ this._indicator.visible = active && this._client.probing;
}
/* Bolt.Client callbacks */
_onProbing(cli, probing) {
- if (probing)
- this._indicator.icon_name = 'thunderbolt-acquiring-symbolic';
- else
- this._indicator.icon_name = 'thunderbolt-symbolic';
+ if (probing)
+ this._indicator.icon_name = 'thunderbolt-acquiring-symbolic';
+ else
+ this._indicator.icon_name = 'thunderbolt-symbolic';
this._sync();
}
/* AuthRobot callbacks */
_onEnrollDevice(obj, device, policy) {
/* only authorize new devices when in an unlocked user session */
- let unlocked = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
+ let unlocked = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
/* and if we have the permission to do so, otherwise we trigger a PolKit dialog */
let allowed = this._perm && this._perm.allowed;
let auth = unlocked && allowed;
- policy[0] = auth;
+ policy[0] = auth;
log(`thunderbolt: [${device.Name}] auto enrollment: ${auth ? 'yes' : 'no'} (allowed: ${allowed ? 'yes' : 'no'})`);
- if (auth)
- return; /* we are done */
+ if (auth)
+ return; /* we are done */
if (!unlocked) {
- const title = _("Unknown Thunderbolt device");
- const body = _("New device has been detected while you were away. Please disconnect and reconnect the device to start using it.");
- this._notify(title, body);
+ const title = _("Unknown Thunderbolt device");
+ const body = _("New device has been detected while you were away. Please disconnect and reconnect the device to start using it.");
+ this._notify(title, body);
} else {
const title = _("Unauthorized Thunderbolt device");
- const body = _("New device has been detected and needs to be authorized by an administrator.");
- this._notify(title, body);
+ const body = _("New device has been detected and needs to be authorized by an administrator.");
+ this._notify(title, body);
}
}
_onEnrollFailed(obj, device, error) {
- const title = _("Thunderbolt authorization error");
- const body = _("Could not authorize the Thunderbolt device: %s").format(error.message);
- this._notify(title, body);
+ const title = _("Thunderbolt authorization error");
+ const body = _("Could not authorize the Thunderbolt device: %s").format(error.message);
+ this._notify(title, body);
}
};
projects / gnome-shell.git / commitdiff